Add implementation of unified vault format (UVF). #16623
Draft
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
chenkins
force-pushed
the
feature/uvf
branch
2 times, most recently
from
4730d93 to
13bfc8d
Compare
chenkins
changed the title
chenkins
changed the title
chenkins
changed the title
…dency to cryptofs (incompatible with cryptolib uvfdraft).
chenkins
force-pushed
the
feature/uvf
branch
from
029b2e5 to
ac3512d
Compare
chenkins
commented
Feb 27, 2025
cryptomator/src/main/java/ch/cyberduck/core/cryptomator/AbstractVault.java
Outdated
Show resolved
Hide resolved
This comment was marked as outdated.
This comment was marked as outdated.
Sorry, something went wrong.
dkocher
requested changes
Mar 6, 2025
chenkins
commented
Mar 8, 2025
chenkins
commented
Mar 9, 2025
Comment on lines
+83
to
+89
| if(new SimplePathPredicate(home).test(directory)) { | ||
| // TODO hard-coded to initial seed in UVFVault | ||
| directoryIdHash = filenameCryptor.hashDirectoryId(id); | ||
| } | ||
| else { | ||
| directoryIdHash = vault.getCryptor().fileNameCryptor(loadRevision(session, directory)).hashDirectoryId(id); | ||
| } |
There was a problem hiding this comment.
@ylangisc what's the best approach - should we cache the revisions per directory along with its ID?
chenkins
commented
Mar 9, 2025
Comment on lines
+156
to
+158
| // TODO still fails as test data from org.cryptomator.cryptolib.v3.UVFIntegrationTest uses latestSeed when creating dir.uvf, hard-coded in current implementation for subdir in DirectoryMetadata subDirMetadata = dirContentCryptor.newDirectoryMetadata();) | ||
| final AttributedList<Path> list = storage.getFeature(ListService.class).list(new Path("/cyberduckbucket/subdir", EnumSet.of(AbstractPath.Type.directory, AbstractPath.Type.placeholder, AbstractPath.Type.decrypted)).withAttributes(subdir), new DisabledListProgressListener()); | ||
| assertEquals(1, list.size()); |
There was a problem hiding this comment.
@ylangisc with the loadRevision workaround, the encryption part of the subdir works and the raw folder is listed remotely, but then fails in AbstractVault.decrypt when attemptyting to decrypt the file name, probably due to the file name decryptor statically linked to the initial revision. Need to continue there.
chenkins
commented
Mar 9, 2025
| final Path metadataFile = new Path(metadataParent, vault.getDirectoryMetadataFilename(), EnumSet.of(Path.Type.file, Path.Type.encrypted)); | ||
| final byte[] ciphertext = new ContentReader(session).readBytes(metadataFile); | ||
| // https://github.com/encryption-alliance/unified-vault-format/blob/develop/file%20name%20encryption/AES-SIV-512-B64URL.md#format-of-diruvf-and-symlinkuvf | ||
| // TODO can we not use org.cryptomator.cryptolib.v3.DirectoryContentCryptorImpl.decryptDirectoryMetadata()? DirectoryMetadataImpl is not visible and DirectoryMetadata is empty interface, so we cannot access dirId attribute. |
There was a problem hiding this comment.
@overheadhunter how can we use cryptolib API to read UVf metadata file?
There was a problem hiding this comment.
Use DirectoryMetadataImpl#cast.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves #16642.
Depends on 1.
Footnotes
https://github.com/iterate-ch/cryptolib/pull/10 ↩